Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Mar 2012 18:00:44 +0000 (10:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Mar 2012 18:00:44 +0000 (10:00 -0800)

Trivial merge